]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
windowManager: Do not shutdown ibus/xsettings on X11 compositor restart
authorCarlos Garnacho <carlosg@gnome.org>
Tue, 10 Mar 2020 12:23:17 +0000 (13:23 +0100)
committerFlorian Müllner <florian.muellner@gmail.com>
Wed, 11 Mar 2020 11:31:45 +0000 (11:31 +0000)
These paths are meant for Xwayland, not for X11 compositors being restarted
through alt-f2 + r. Maybe some signal analogous to init-xserver should be
added for Xwayland shutdown paths, but this signal we are currently
listening for is backend agnostic.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2329
js/ui/windowManager.js

index 8f0e8943da974a37fc43e13247117f694ff06612..21c63b5c320695c9a0e7d35649b5fe463826f2d4 100644 (file)
@@ -924,6 +924,8 @@ var WindowManager = class {
             return true;
         });
         global.display.connect('x11-display-closing', () => {
+            if (!Meta.is_wayland_compositor())
+                return;
             Shell.util_stop_systemd_unit('gsd-xsettings.target', 'fail');
             IBusManager.getIBusManager().restartDaemon();
         });